From: Bill Wohler <wohler@newt.com>
Date: Mon, 4 Jul 2011 02:58:14 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~845^2~206
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3ca74e5368a1022e332a0601d9be2418dbe8c083;p=emacs.git

Merge from trunk.
---

3ca74e5368a1022e332a0601d9be2418dbe8c083